New image

2004-11-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/images/combo-box.png: New image

	* gtk/visual_index.xml:
	* gtk/Makefile.am (HTML_IMAGES): Add combo-box.png

diff --git a/ChangeLog b/ChangeLog
index 6dd0a434c41793f55d82b63372b9b7efc4a5961d..e310fe45a2b2c7462dbcc9cd149851ef77856b21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * docs/tools/widgets.c: Add a combo box.
+
 2004-11-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcolorsel.c (key_press): Implement keynav for the color

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6dd0a434c41793f55d82b63372b9b7efc4a5961d..e310fe45a2b2c7462dbcc9cd149851ef77856b21 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2004-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * docs/tools/widgets.c: Add a combo box.
+
 2004-11-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcolorsel.c (key_press): Implement keynav for the color

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6dd0a434c41793f55d82b63372b9b7efc4a5961d..e310fe45a2b2c7462dbcc9cd149851ef77856b21 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2004-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * docs/tools/widgets.c: Add a combo box.
+
 2004-11-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcolorsel.c (key_press): Implement keynav for the color

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6dd0a434c41793f55d82b63372b9b7efc4a5961d..e310fe45a2b2c7462dbcc9cd149851ef77856b21 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2004-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * docs/tools/widgets.c: Add a combo box.
+
 2004-11-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcolorsel.c (key_press): Implement keynav for the color

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 3f6f8f189e6a4add250bbe1d19b1575a64695575..cbf23537f935f1fd479a6937397ad9c75ed0e772 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/images/combo-box.png: New image
+
+       * gtk/visual_index.xml: 
+       * gtk/Makefile.am (HTML_IMAGES): Add combo-box.png
+
 Sat Nov 20 16:01:51 2004  Owen Taylor  <otaylor@redhat.com>
 
         * gdk/gdk-sections.txt gdk/gdk.types : Update for GdkPangoRenderer

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 684a4bb129d508854696c99030c91dc7168b825d..c257b677c1a335e3d128c9acd3c1a884b5ec8840 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -210,6 +210,7 @@ HTML_IMAGES = \
        $(srcdir)/images/button.png                                     \
        $(srcdir)/images/check-button.png                               \
        $(srcdir)/images/color-button.png                               \
+       $(srcdir)/images/combo-box.png                                  \
        $(srcdir)/images/combo-box-entry.png                            \
        $(srcdir)/images/entry.png                                      \
        $(srcdir)/images/file-button.png                                \

diff --git a/docs/reference/gtk/images/combo-box.png b/docs/reference/gtk/images/combo-box.png
new file mode 100644 (file)
index 0000000..0fa98d2
Binary files /dev/null and b/docs/reference/gtk/images/combo-box.png differ

diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index 489b68c5061076a55eafbd673d7aeaa8917b3ae7..03c25eaefdcd18fc676eb2e803d54c2c18bc486a 100644 (file)
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -11,6 +11,9 @@
   <link linkend="GtkColorButton">
     <inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic>
   </link>
+  <link linkend="GtkComboBox">
+    <inlinegraphic fileref="combo-box.png" format="PNG"></inlinegraphic>
+  </link>
   <link linkend="GtkComboBoxEntry">
     <inlinegraphic fileref="combo-box-entry.png" format="PNG"></inlinegraphic>
   </link>

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 58c68896332bd781842f5d28d68582a4b53bde16..543c96b68dcfaffa875f1164aaf1f64994a7f3bc 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -261,6 +261,10 @@ create_combo_box_entry (void)
   GtkWidget *widget;
   GtkWidget *align;
   
+  gtk_rc_parse_string ("style \"combo-box-entry-style\" {\n"
+                      "  GtkComboBox::appears-as-list = 1\n"
+                      "}\n"
+                      "widget_class \"GtkComboBoxEntry\" style \"combo-box-entry-style\"\n" );
   widget = gtk_combo_box_entry_new_text ();
   gtk_entry_set_text (GTK_ENTRY (GTK_BIN (widget)->child), "Combo Box Entry");
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
@@ -269,6 +273,26 @@ create_combo_box_entry (void)
   return new_widget_info ("combo-box-entry", align, SMALL);
 }
 
+static WidgetInfo *
+create_combo_box (void)
+{
+  GtkWidget *widget;
+  GtkWidget *align;
+  
+  gtk_rc_parse_string ("style \"combo-box-style\" {\n"
+                      "  GtkComboBox::appears-as-list = 0\n"
+                      "}\n"
+                      "widget_class \"GtkComboBox\" style \"combo-box-style\"\n" );
+
+  widget = gtk_combo_box_new_text ();
+  gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Combo Box");
+  gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (align), widget);
+
+  return new_widget_info ("combo-box", align, SMALL);
+}
+
 static WidgetInfo *
 create_text_view (void)
 {
@@ -759,6 +783,7 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_button ());
   retval = g_list_prepend (retval, create_check_button ());
   retval = g_list_prepend (retval, create_color_button ());
+  retval = g_list_prepend (retval, create_combo_box ());
   retval = g_list_prepend (retval, create_combo_box_entry ());
   retval = g_list_prepend (retval, create_entry ());
   retval = g_list_prepend (retval, create_file_button ());